bitkeeper revision 1.1236.1.106 (423fdf68Jj2B3iL1Ab8caOSNgsAs-w)

Cross-architecture build fixes.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index a69b5d19d846613099439cd201f2a3ea9620d256..8813609df3009730011233aa7585e25ec786f911 100644 (file)
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -20,6 +20,7 @@
 #include <asm/uaccess.h>
 #include <asm/mm.h>
 #include <asm/debugger.h>
+#include <asm/io.h>
 
 /* opt_console: comma-separated list of console outputs. */
 static char opt_console[30] = OPT_CONSOLE_STR;

diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c
index 71c0bb428d3d176658a1f1df5ef9e070d8860603..25de96ba44a17491befadbbdee24664557a182bb 100644 (file)
--- a/xen/drivers/pci/quirks.c
+++ b/xen/drivers/pci/quirks.c
@@ -18,7 +18,6 @@
 #include <xen/pci.h>
 #include <xen/init.h>
 #include <xen/delay.h>
-#include <asm/io_apic.h>
 
 #undef DEBUG
 
@@ -333,6 +332,8 @@ static void __init quirk_vt82c686_acpi(struct pci_dev *dev)
 
 #ifdef CONFIG_X86_IO_APIC 
 
+#include <asm/io_apic.h>
+
 /*
  * VIA 686A/B: If an IO-APIC is active, we need to route all on-chip
  * devices to the external APIC.